Rename directory for docker images and remove commented out code