Fixed db sources. clean up