Removed TODO:s we won't have time for.