some misc grinder cleanup

When reviewing your CL I noticed some (unrelated) grinder cruft. @dinhviethoa