Removed unused database related stuff