REFACTOR: removing wait handlers