Removed some unneccesary imports
Merging conflicts from master