Drop deprecated code
Version bump, rc2