Removed un-needed todo