Should I remove the inheritance as well?