PLA-1628 Refactor Special Promote

IMnshO it should be necessary and its just a relict of old times. @SebastianMarzjan any comments ?