0.3.0.5

Cleanup