Simplify

Remove function that's a bit too clever for its own good.