Get rid of  syntax which isn't supported anymore