i9500: Remove deprecated overlay options
i9500: Re-organize overlay