Spring Cleaning

This:
https://github.com/mindrunner/docker-android-sdk/commit/f06b7d717d6ba9d229838fc86ecd94edbd7c52a7#commitcomment-112749896

We will clean up legacy stuff. Hard to tell if it's gonna break things! 

Please create ticket or PR if you face any issues!!