If/when we attempt this project again, it may use a different design, so we should remove the dead code that was added during v4.4 development.