Cleanup for RC2