removed a bunch of duplicate function definitions. (?????)