i9500: clean-up