Cleanup

Cleaned up useless imports etc etc etc