Clean up. irrelevant changes