[dirtyState] Minor clean-up, removed unnecessary deprecation

Change-Id: I243492cb986131f73f42785d3bd13db156b860af