Fix: cleanup