removed old unused and commented code