Removed unneeded code