#78 better listeners handling
cleanup