Remove commented-out code here