addresses cleanup