fix(device): avoid conversion to canonical bytes

Also, remove unecessary conditions prio to rule insert/update operations

Signed-off-by: Georgios P. Katsikas gkatsikas@ubitech.eu