updating regex and remove legacy style properties from headers