remove a few unnecessary functions