remove unnecessary functions again