remove unused GenericFunction class
sort symbol definitions