Next iteration of build changes/cleanup.