Add some methods to model and remove unused fields
Modify view and controller to adapt to model
Remove unused file