Gut data

Removing old data descriptors