(Re)moving FIXME comment markers