Can you do this in a separate PR, to keep this one focused on the current issue? This way we can merge the removal of the extra files while we sort out the async issue. Thanks!