argh cleanup