Fix: remove obsolete code