Removed database dependencies