minimal cleanups