DDF-705
Cleaning up unused code and removing fixmes that were done but not removed.
Cleaned up the html for the system information.