[no-task]: some cleanup