Cleanup to work RPi-less