Remove deprecation and doubled actions