restructured specialization, finalization and cleanup
pulled in from version/2.1 : restructured specialization, finalization and cleanup