Make mapping code more sensible, clear out dummy cubes, ready for real data