Remove user facing request stuff ready for #115