removed useless stuff, upgrade to doctrine 2.4