Shobiz: Code cleanup - removed the use of store ids