Remove commented-out references to non-existent code