reverted cleanup of properties