clean up newly created bugs