i9300: Cleanup