comments cleanups
delete some unneded parameters