Remove redundant tasks

Change-Id: Ibdfc6c5315e57050095864525ed450c6af20fa52