Clean up devices and connections type