Errant subsititutions removed