Clean up and move to v1.0.0