Remove deadcode
Move DoctrineStatementWrapper to its own file