Clean up globals/macros
Clean up imports
Fast fail on cluster topology inconsistancies