Removed irrelevant todo