Remove Model. Fixed Lint issues