AI server: more miscellaneous cleanup