Removing this. stage one.
Minor edits and cleanup around the user interface and data objects.