Clean up common again