Removed deprecated FIXME