Removed some custom code in favour of a patch to views data export