Continued clean up in preperation for extracting monitoring engine