[clean] some more clean