Removed some unneeded code