remove unnecessary fixmes, add one new