Remove unecessary functions