Clean up and import changes