Removed shipping specific code from shop core