Refactored, moved helpers to IPHelper del unused

deleted unused vars