removed dependancy on dbj