misc: cleanups