code cleanup.  removal of some deprecated function parameters