General cleanup, because it no worky.