Removes unused class variables
Implements job controller for rebuilding the catalog index
Improves coverage