Fix: remove function