Finished cleaning up annotation demos.