Stuff I didn't need to commit has been removed