Started a needed cleanup