Deleted unnecessary includes and cleaned up.
Deleted comment
Merge pull request #40 from troyane/DAO_cleanup

Dao cleanup
Merge remote-tracking branch 'upstream/master' into features_loop_recorder