debug disabled, controllers removed, cleaning up ;)