Old 'TODO' either solved or removed