Clean up and new file