Build cleanup, will be reverted after build.

This removes errrors that existed at the time when the snapshot was
taken.