Remove b/cursor (don't need to encapsulate)