removing old unused code