remove dependencies on helper classes
added new helpers