Org file cleanup