minor changes, removing useless arguments