Remove overparanoid code