Cleanup
Removed database dependency