minor changes
removed some old unused code