align master/cleanup to work