Sonata cleanup