"Basic" corrections

removed commented code
Separated generic ORM features of User into a BaseModel object