clean up imports, run TContent/ new classes through formatter