Unnecessary setters removed