G.2 - removed commented code