0.4.0
cleanup