Remove extraneous code and imports