Cleaned up unneccesary code