Database models and query refactoring
Cleaned database queries and removed unneeded parts
Updated SQL creation script to reflect database changes