Fixing the application/service deleting issue