Updates and remove unused
updates