more cleanups of manual move