Redundant parent class removed + further simplification.