Code cleanup
Update to mbapi 1.10