Refactor - remove fixme