Some cleanup of the example apps