Clean up habitat lookup database and methods