Remove unused color, more cleanup