Removed more unneccessary functions.