Removed commented-out arg params