[CSR-137] Removed unrequired code