Removed class related to store and containers