Get rid of useless hazardeous code (ref #964)