ISSUE-140: Remove wrong code