removing crufty code