Motion -> clean up dead code.