cleanup; added db aliases