More cleanups via @jrick