cleanup
fixes to basket manager