Correct regexp, one command instead of two, remove old properties