Put into ifdef/endif blocks some old code I had previously completely deleted