Nearing final cleanup