Cleanup and add postinstall