Partial fix toward removing ports from a device #324