Clean up source to fix some bootloops