using doctrine, cleaning up,..