Removing 'TODO' section, for now