Remove semi-deprecated stuff, despite its awesome ASCII...