Removed more unneeded code