Remove onUpdate event + small changes