Remove now redundant helper functions