Remove unused package and service