Removed duplicate tasks

Cleanup of tasks that were accidently duplicated.

Change-Id: I2ff9dd8d7f778be4a1bf85510462542cb68153b1