Removed 1.6 stuff, more Ceremony work.