[maintain] do some cleanup