Update to Katana RC2, DB cleanup