Cleanup for Gateway-3384