OFStateManager cleanup

Reviewer: @harshsin 

These changes remove a bunch of dead code in preparation for optimizing non-strict queries.