Remove more commented-out code here