Housekeeping
Remove unnecessary check on main memory store method