Removed deprecated and unused code due to refactoring.