#52 Drop a couple old workarounds in the container code
Merged by ngompa. Opened by adamwill.
adamwill/cloud-image-uploader drop-old-workarounds  into  main