Trimming the Fat

Getting ready for SDCC 10