removed topfun references