v1.0

Cleanup