Try to clean up the build a bit.