Added pre-cleanup + no echo

Added pre-cleanup + no echo