Remove unused package private method and so remove some complexity