Removed handling of small devices