Refactor

Remove pauses. Add use of data-ui selectors.  Add cleanup steps.