more cleaning of stuff moved to store