Removed unused FIXME