Fix: remove unnecessary code