v0.0.6 Some cleanup