Moved all functions out of classifications, deleting