[minor] Be more defence with the newly introduce free method
[minor] Remove pointless event listen