Removed all references to mock_state directory