removed some old/unused lines