Remove strainer

Change-Id: I80dc34029c881fd87ab0750d0c3dc0cae85b0667