common: cleanups