Finished cleanup of workaround, still needs to be resolved
Fixed functor law proposition which was changed to debug