rework branch logic

ics leo specific stuff is done via a seperate branch now