sh/kernel/ cleanups