Remove unused dependency and variable