continue cleanup to V5