Getting rid of the yelpy stuff.