cleanup of cruft as per pr comments