v0.3.0 - Cleanup