Remove DA header file reference and other DA dependent code changes. Change-Id: I49804f753390b8952e45679b178162dd60bb43f6