Cleanup; merged EU and US version