Rubicon cleanup