Lots of changes
Removed some imports