cleanup to work on firefox