move mratwork-* detect from cleanup to upcp