Bugfixes

Reorganize some piece of code.
Remove unused listeners.