+butils version up
+some cleanup