Temp fix for #45 - not pretty, but easy.

Removes the complicated pieces from the setup.

Haven't tested fully yet personally but eyeballs say it should be good. Can wait until I can test it (or someone else can) to be sure it does as expected.