further setup cleaning