Remove functions that are not used anymore