Cleaning up clashing properties