Remove commented lines
Remove method overrides that just call super
Organise imports