removed old unused code