Removed some old/unused code.