Remove the Graph when the status recorder is disabled
Fix Device creation