Remove extraneous functions