Remove Unneeded code