Cleaning up and removing unneeded imports