Removes old PropertyData and uses int instead of long for tokens

See the two individual commits for more information.