cleanup, closes #460