Remove completion routine (will be added in App-PMUtils)