Rm unused feedback stuff

Change-Id: I57ebab41f7ebbb9528b616557a704ff632e24a73
Merge "Rm unused feedback stuff"