Remove Unit of work and edit base model