Removed Scherzo cruft