After mergin development, cleaning chebfun.m and fun.m