Cleanup some leftovers copied from web example