Cleaned up some things before making fresh branch