Fix code signing issue & remove deprecated code