some cleaning
setup considers uncommon