Include orm_adapter code in this gem for inclusion simplicity
Fix too ambitious cleanup