[441] Remove more 2.7isms