Removed unnecessary code which isn't used anymore