More DOckerfile cleanup