CLOUDIFY-1305 remove commented code and un-necessary test