cleanup for #54 and #55