Almost final clear out.

completed