[TASK] Allow picks to BuildEssentials & cleanup

Change-Id: Ieedb765208260382bd5142a4e0b76a9a18131d2e
Merge pull request #1 from kdambekalns/buildessentials

[TASK] Allow picks to BuildEssentials & cleanup