Removed some un-needed data storage in comm.