Added trap for failed clean