Some cleanup and removed things I'm not going to have time to implement