Validation cleanup, devices done