Remove lib functions, commented out tests
Merge branch 'lib_reduction' into model_reduction