Cleaning up lock.device-type.groovy