Revert "Added some reporting and other updates"

This reverts commit cf607c46b0f260eadc61830cc4081a6f23d213bc.