killed some old trivial code