cleaned of database classes