REMOVED: pre 0.2 migration code