Fix: remove comments