Cleaned up and removed stuff that shouldn't have been checked in