Update and remove unused