More mkd cleanup.