Removed unneccesary stuff from MacroCell class