Removing uneeded functions