Reverted movement and some cleanup