Kill RGB mappings and various other cleanups