Cleanup for new devices :)