Remove RC1 only code