Merge "Clean up assertion checks"