Remove some Richard specific stuff