Merge "Checker cleanup"