More services & small clean ups

Take all the "Unknown" entries out of the table, since they'll be handled as missing by the Service dispatcher anyway.