Small tidyup of deprecated properties