More aggressive states cleanup