Small fixes and removed unneccesary imports.