Removing now unneeded code