remove some 5.4+ only syntax