Fix offline cahrging on EXT4 CM7 and cleanup