CAP-1222 - quick branch clean and sample calls