v0.0-18, more cleaning