cleanning and redo