Use service for deletion as well