Removing some ugly traces.