silly fixes
remove useless funs