Refactor: Removed a tiny bit of legacy code