Cull useless gif rules, fix up todo a bit