Merge "remove unnecessary implementations" into tizen_2.1