Further cleanup to apiServer

 * Continues on 514b365dd16ff34e469a2eeb76ee3aa9321c8b77.

Change-Id: I1d0b42e53ef519117a296d8544111bf28735376b