Cleanup for sparse checkout
Further cleanup