remove more 5.4 code