! Clean up more old settings not in use any more, fixes #1252

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Missed this one from Mantis 1493 (did previously, forgot to commit)

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! We have this nice standardised code and we don't use it properly. So let's use it properly and fix #1250 in the process (hopefully)

Signed-off-by: Peter Spicer <sleeping@myperch.org>