WIP - remove ivar