[TASK] Allow picks to BuildEssentials & cleanup

Marc already merged it, but Kernkaart uses your fork…