Use macro for partition name ; commented out unused code