Remove the 'keyonly' feature. Rely only on 'fetch'. [in-progress]