Remove extra FIXME comments