removing db dependancies