Code cleanup: Removed getters and setter for properties that were removed. Fixes: #5735
Merge remote-tracking branch 'origin/master'