removing some old code