Removed shop, removed and more messageclass charges