Got rid of some unneeded code