Remove functionInfo references