more cleanup - fixing stores