cleaning out some unused function arguments