Removed redundant TODO