Fix: Remove unused variables?