some removal of arguments in code