[TASK] Allow picks to BuildEssentials & cleanup

Allows to pick changes to Build/BuildEssentials (trivial change) and does some cleanup along the way.