Remove polyfills for now