Remove unnecessary movement functions