Updates to make repo smaller and build faster