Add todo notes about obsolete code