Remove unused 'hack' helpers.
Work in progress