1 13 cleanup

Maybe worth a look with 'blame'