Cleanup some controller handling and localize device types