[TASK] some cleanups