pr1351: cleanups (except for unused/legacy stuff)