Cleaning up Symfony2 notes