GH21 - removed garbage code