Removing wait from the device attachment