removed dependency of database