Removed some now unused code.