Cleaned up databases to accomodate narrower feature focus