Clean up changes to a minimum