More restructuring and cleaning up