Remove unused code from util server block