Remove unused
Use consistent variable names
This isn't a datastore kind
p is a more accurate name
Major refactor of feed import logic

OPML import is current broken.