Clean up device loading and init a bit