Remove usage of moveFront