QA-169
removed commented out code