Try to fix unbindAll - not yet finished