Cleanup of the graphics Manager logic