fix onDelete & finish removing hives