cleaned some comments and unused code; closes #140