Removed irrelevant TODO comments