Finalizing clean up