Clean up unneccesary code