clean up some stuff, minified version