Remove more dead code from OFStateManager

Reviewer: @harshsin