First attempt at simplifyng the building deletion code