issue 186 - removed commented out code