Fix: redundant code