remove unused funcs, minor updates