Re #1143 Removing code garbage.