some more cleaning before 0.2.0