Cleanup: Removing some obsolete code after refactoring.