Clean up self-made files to keep align with upstream