md2 needs cleanup