remove 'remember' stuff from TODO