Merge "Removing some dead definitions" into tizen