Merge "Remove unnecessary class Inheritance"