remove unneccessary pubs, shorten names