Remove use of deprecated setters