Fix issue #2, removal of pins