Merge "removed block of commented-out lines of code"