Removing excess scheme mojo