Remove some leftovers after bug 858039 fixed