Cleanup prior to release