Remove device control / add new packages to build