add gorm module, cleanup