Closes #813
cleanup