Removed duplicated interfaces which was created during merging conflict patches