Cleanup

As discussed in #esnext-infrastructure.