Remove some cruft from response
More tutorial and code cleanup