remove unused and update