correct logic errors

We were not removing the old class maps
We also were not instantiating a class in the filter iterator