added the availability to comment constants to remove some of the additional hardware