Clean up

Cleaned up useless imports etc etc etc
Removed too much

Whoops