Removed unnecessarily duplicated-instantiation in READMEs, update TODO