Update descriptor and remove old code