Remove last references to tem and 10.*