Fix: Remove useless methods