Remove more 5.4 usage