Improving the build speed and cleaning up.