Revert "added move functionality, needs thorough testing."

This reverts commit 4894bae22750cd0db1be77922e3afcedcec24de1.