Removing unneccessary functions