Updated back to move & remove version