Fixed item cleanup using wrong location