Remove _specialized & make cosmetic changes
Merge changes