Clean up. v1.0.2