Removed commented-out mess of parameters.