removed and reorganized