! Unnecessary code

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! RGB checking should be improved, thanks to @Spuds

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1199 from Arantor/release-2.1

Minor things