Okay so I synced my Kobo with the server, and it brought down all the empty shelves.. then I plugged my Kobo in, let Calibre do its magic, and then unplugged it. When I checked the device, there were no empty shelves. So I synced it with the server again, and still no empty shelves!!!

lovely! Thank you davidfor.. exactly the fix I was looking for!