Cleaning up some unneeded code