Cleaned some classes from importing and using unecessary things