Clean up code & devicemanager interface changes