Refactoring: Removed some old code.