removed old unused things