Minor fixes
Dev: Remove DataBlock

Note to self: Figure out what it actually did
Minor fixes