Removing stuff, fixed compile