Cleanup, add feature flags back.