Move more redundant code.