Tweak to support pinoccio pins + cleanup