master cleanup