o removed unused code
(cherry picked from commit 98cb28cdd7fdd175264e06ec46628cf8adad688b)