Remove legacy commented out code