add come better cleanup