cleanup for FF