master cleanup 2