Merge "Remove unuseful code" into tizen