Simplfy unneeded cruft away.