CLOUDIFY-2180 removed unused import and cleaned comments