Remove useless imports
Cleanup
Cleanup recent code