[ACTION REQUIRED] Legacy code removal