Removed some old, now unused code.