clean up of move block code