clean up unresolved some more