Cleanup, use non-minified versions