add phpunit as deps dev
protect utility methods from controllers
remove dead code