General revision and inclusion of debug system

Commit this record that are no longer being used were removed, and the
system was included debug