Cleaned up the imports in TContent more