removed "kinds". Single class of items per server. Code expiration from envir.