Flatten the subclassing
Remove dead code