cleaning merge remaining shit