Cleaned db schema