Revert "movement related changes while validation"

This reverts commit 090c9fb23a445c28f4f83e9cb5fb523e560ba99d.

movement related changes while validation