manage shop code cleanup