More cleanup for local processing