removed special case stuff
removed old stuff