Remove taint

Change-Id: I8d81905ffdce25e8832a417c310c705f3c9ce0e1