remove dependancy on database