removed some shop specific things