Remove unused header and property key