mantis #124
cleanup