Tidied up unused code from 8bit CC