I will clean this up too. Just did this for FeatureMap for now. Just some debug code left over I guess.