Better init without device, also removed old stuff