Remove shelve code