005 cleanup