Removed store layout logic. Was breaking and is not needed.