Giant cleanup from shellcheck.net

Hopefully this didn't break anything
shellcheck.net changes exposed a bug with the unsupported properties feature