Remove unnecessary functions