Removed prints, and unused imports
Fixed change class

broken: