Revert "Add minimal and attempt fix OnBoot"

This reverts commit ca51f3230deddefe5413d1ffc4bbcc2693eb86f0.