Move the surpluser to an external class
Remove unused feature