Removed Scherzo cruft
Removed Scherzo cruft