Clean up commented-out code