master cleanup2