Revert Move modifications (will redo later bits by bits)