Remove unnecessary class Inheritance

This is to remove the unnecessary class inheritance
to make code more readable and easy to debug.

Change-Id: Id98ad9df2eada05d3e14d3c523bc7876ef6ecbbe
2 files changed