added proper (exported) GPIO removing
refactor