Remove DB From includes