Remove unused argument.
Remove defunct property.
Merge pull request #3360 from ADmad/3.0-exception

3.0 exception