added ip address container, and fixed clean