Removing unneeded custom functions