Cleanup and add in common processing.  Corrected issue where the
resource publication was occurring at the wrong level.