cleaned up lookups and tools apis.