Unregister listeners + other changes