cleaned up unused variables. closes #252. closes #251.