PDK-5910: Additional cleanup in ESM example app.