cleanup
update shim for safari