Attribute data file changes

Remove the ATTR prefix from the attribute keys since I should be able to
tell the difference in context between data types

Remove the type property, since I don't plan to actually use it.

Both of those could go back in at some point I suppose, but I want to keep
it simple and only do what I actually need.