Removing unneeded stuff, part 1
Removing unneeded stuff, part 2