Fix: some clean