Remove Michael-specific stuff