PLA-1628 Refactor Special Promote

but It will be cleaner to remove them any way, so