Removed OpenORM, fixed conflicts