Remove duplicate code

Change-Id: Iadc76feaca0f9f3ea1ed49a64948ed785ba43ca8
Reviewed-by: hjk <hjk121@nokiamail.com>