cleanup, safari tested