REFACTOR: Removed obsolete/dead code