removing some old unused stuff