a bit more cleanup, getting rid of the Shared mixin
a bit more cleanup, removing unnecessary checks/guards