Final removal of nickname stuff, will be a larger project for another day.