Cosmetics
Remove references where inappropriate
Remove references where inappropriate
Remove more references
Remove references where not appropriate