[build] more thorough cleanup