Remove unused dependency + Small update