:bug: Fix leave test
:fire: Remove less frequently used function