Remove excess setters, code cleanup.