Continue cleaning up class hierarchy