AUTO-459 Commented code erased