fixed duplicate entries in log files
storage: started porting to cm 0.9.x