Cleaned up helper files so only the necessary helpers are used in the viewer.