Do we still use these? I'm happy to close this PR if we still want this but it feels like these may have served their purpose and no longer be necessary.