Class generation cleaned up.