Remove database dependancy