GH21 - removed unecesarry code and comments