Removing a bunch of unneeded stuff