Fixed some unnecessary code and imports