Took out some old code that apparently breaks