Don't need player attribute stuff.
Merge master