Removed almost duplicate method
Removed inheritance

We don't gain anything now by inheriting the implementations from a base
class.