Remove a FIXME
Remove another FIXME