aspects and cross-store stuff removed