Fix minor issues in StateManager. Specifically, remove a few redundant method calls