Branch cleanup in preparation for v1.0.0