Removed some Unneeded code.