some cleanup in preparation for a GCM refactoring