[CLEANUP] - Cleanup before release