Fix Homes issue
Remove some tables