Fix: some cleanup