Remove some funs which are so complicated