Revert schema changes

Apply schema changes

Add feature flag test

Add foreign keys

Remove explicit key removal