Finished partial search and cleaned up references