Delete completion function, grab some updates from various folks