ref #77 #105 cleanups