get rid of pin references