Cleanup of comprehensions