Cleanup and X files