Got rid of some unneeded stuff