fix for garena and cleanup