Misc master cleanup