TP5: More code cleanups