similar cleanups