Removing redundant TODO