Removed shop dependency