Symfony 2.3 - cleanup