i9500: clean up storage params part1