Removing unneeded functions