Comment out debugging code.  Refactor to use constants for StoreId headers.