Removed fields removed from model
Removed some comments