GH21 - removed a TODO