clean and move
some fix
before sumbit