Remove more 0-8isms