removed some old/irrelevant stuff