Move unused setters
Removing unused setters