Issue 6403 clean up properties on refresh