Simpler calling.
Remove old code.
Adding TODO in tests.