DAO fix and old DB API files removal