Trim down data returned from API
Misc housekeeping