cleanup. closes #27