Removed no-longer-needed fixmes