Remove ClassUtils, fix router