Removed fuss and nonsense from device wrapper