removed some unused function arguments