Copy tidying, clearing redundant code.