Remove class inheritance as it’s not needed