Better package name and remove unused dependency