cleanup fixmes