Move away some of the more confusing configs which don't seem to be required
atm (according to the tutorial).