more setup cleaning