Cleanup, after a failed attempt at template precompilatin