Merge "removed redundant code" into tizen_2.2