Remove database code
Add missing dependency