clean up as per feedback on SYS-62