CFY-1840 removed docker install command option and some refactoring.