VID-1936 Add docs, cleanup debugging code