Got rid of commented out code [MJ-342]