No worries, I totally understand this can be confusing :D
There's no need to devote your ED/BD in order to gain some through the Role Models or Bodybuilder upgrades.
I recommend only devoting basic Disciples and keeping all the other types of Disciples. This way your next Devotion run starts with an advantage.