* cleanup removing unused headers
* Updated asserts in code base that needed messages (marked as deprecated)
* left one test that was testing a deprecated constructor. When that code is removed we can remove that test.
* some other cleanup
resolves#338