Cleaned up db schema