Be a bit smarter about removing RES stuff.