Clean up directory mess